Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure that machete file for worktrees is sought for in the top-level git dir #361

Merged
merged 4 commits into from
Dec 1, 2021
Merged

Make sure that machete file for worktrees is sought for in the top-level git dir #361

merged 4 commits into from
Dec 1, 2021

Conversation

PawelLipski
Copy link
Collaborator

No description provided.

@PawelLipski PawelLipski self-assigned this Nov 27, 2021
@PawelLipski PawelLipski linked an issue Nov 27, 2021 that may be closed by this pull request
Support for worktrees should NOT be identical to the support for submodules #360
Closed
@PawelLipski PawelLipski added bug Something isn't working underlying git Relates to underlying git operations labels Nov 27, 2021
@PawelLipski PawelLipski force-pushed the bugfix/360-worktree-support branch 2 times, most recently from 9005d19 to 2481213 Compare November 27, 2021 23:28
This was referenced Nov 27, 2021
Closed
Merged
@PawelLipski PawelLipski added this to the v3.6.1 milestone Nov 29, 2021
kgadek
kgadek approved these changes Dec 1, 2021
View reviewed changes
Copy link
Collaborator

@kgadek kgadek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some 🚲🛖 over documentation, but overall lgtm

docs/source/cli_help/discover.rst Outdated Show resolved Hide resolved
docs/source/cli_help/file.rst Outdated Show resolved Hide resolved
docs/source/cli_help/file.rst Outdated Show resolved Hide resolved
git_machete/docs.py Outdated Show resolved Hide resolved
@PawelLipski PawelLipski merged commit ecd8c6a into develop Dec 1, 2021
@PawelLipski PawelLipski deleted the bugfix/360-worktree-support branch December 1, 2021 17:32
@1wsx10 1wsx10 mentioned this pull request May 11, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifel123 rifel123 rifel123 approved these changes

@kgadek kgadek kgadek approved these changes

Assignees

@PawelLipski PawelLipski

Labels
bug Something isn't working underlying git Relates to underlying git operations
Projects
None yet
Milestone
v3.6.1
Development

Successfully merging this pull request may close these issues.

Support for worktrees should NOT be identical to the support for submodules
3 participants
@PawelLipski @kgadek @rifel123